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

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



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