Merge "Merge changes I0ababa6b,I1a1ad69b into tm-dev am: 27a45d8e am:...

Merge "Merge changes I0ababa6b,I1a1ad69b into tm-dev am: 27a45d8e am: f909a931" into tm-d1-dev-plus-aosp am: 96eedb59 am: d22f7126

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



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