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

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



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