Merge "Android 1<3." into tm-dev am: 0f8269e6 am: a95ab05e am: dfd56824

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



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