Merge "Fix behavior when config_guestUserAutoCreated=true" into sc-dev am: 3d123e4a am: 24b93037 am: 3282075f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15350815

Change-Id: I101ac0d38a8e86eed9b3cfdc2399604122d35ae9