Fix merge
Fix Settings app crash after enabled multi-user

Bug: 8128225
Change-Id: I2918a5ec36e861a1ce4b2e67cf7607929732a7bf