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

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



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