[automerger skipped] Merge "Remove feature flag...

[automerger skipped] Merge "Remove feature flag SETTINGS_GUEST_MODE_UX_CHANGES" into tm-qpr-dev am: 6d61300d am: 27b1ba20 -s ours

am skip reason: Merged-In I12b4d60ffc76c20e0964d8e222b13907009b0cd7 with SHA-1 9007919a is already in history

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



Change-Id: I9868d85e0592d269dc3ed2cb8b3aa5574c015391
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>