Merge "Merge "Android 1<3." into tm-dev am: 0f8269e6 am: 24650a74" into...

Merge "Merge "Android 1<3." into tm-dev am: 0f8269e6 am: 24650a74" into tm-d1-dev-plus-aosp am: f9b14664

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



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