[automerger skipped] Merge changes I171604ee,I81d648e5 into tm-dev am:...

[automerger skipped] Merge changes I171604ee,I81d648e5 into tm-dev am: bf0730ed -s ours am: aedc5997 -s ours am: 5193b4cd -s ours am: 94d78546 -s ours

am skip reason: Merged-In I171604ee6dc40f1d44ac65525c32ff97f1fa1d76 with SHA-1 c3639d29 is already in history

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



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