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 am: c1e5de25

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



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