[automerger skipped] Merge changes I9ba57f43,I236b039c into tm-dev am: 3c6f225e -s ours

am skip reason: Merged-In I9ba57f4347e50f8462cec347e5608ec4d1eb0b30 with SHA-1 cfe2796f is already in history

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



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