Merge "Merge "Move non-settings-specific logic to frameworks/base" into sc-dev...

Merge "Merge "Move non-settings-specific logic to frameworks/base" into sc-dev am: ffc5989f am: c8a47e1e" into sc-v2-dev-plus-aosp am: c9169471

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

Change-Id: I2c75af8780c6e2c054bb58e42f47388ed00a4bbb