[automerger skipped] Merge changes I30579090,I7a725647 into tm-dev am: fb0f8533 am: c351acab am: 1ee97e0e am: 5d132699 -s ours am: 79a6cfbb -s ours am: aab1ac5d -s ours

am skip reason: Merged-In I30579090c803b231fd750abbc4ad645805f7ece2 with SHA-1 e836611f is already in history

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



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