Merge "Merge changes I282ed7eb,I4e9ca9ed into tm-dev am: 772f09fe am:...

Merge "Merge changes I282ed7eb,I4e9ca9ed into tm-dev am: 772f09fe am: 2c8a9755" into tm-d1-dev-plus-aosp am: 3899a7c8

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



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