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

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

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



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