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

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



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