[automerger skipped] Merge changes I9ba57f43,I236b039c into tm-dev am: 3c6f225e6f -s ours am: 58313f143d -s ours am: 38c3ff00f7 -s ours
am skip reason: Merged-In I9ba57f4347e50f8462cec347e5608ec4d1eb0b30 with SHA-1 cfe2796f78 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18360038
Change-Id: I85101c5bd9c99f01249390464099c89c56a538a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: