Merge "Merge changes I1978ce3a,I79160004 into tm-dev am: 35640f94 am:...

Merge "Merge changes I1978ce3a,I79160004 into tm-dev am: 35640f94 am: d0cd381a" into tm-d1-dev-plus-aosp am: d776c51b am: 850b3a1c

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



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