Merge "Merge changes I171604ee,I81d648e5 into tm-d1-dev am: 44248851" into...

Merge "Merge changes I171604ee,I81d648e5 into tm-d1-dev am: 44248851" into tm-d1-dev-plus-aosp am: 6f85a82b

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



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