Merge changes I0ababa6b,I1a1ad69b into tm-dev am: 27a45d8ec3 am: f909a931c8

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

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