[automerger skipped] Merge changes I30579090,I7a725647 into tm-dev am:...

[automerger skipped] Merge changes I30579090,I7a725647 into tm-dev am: fb0f8533 am: bdf07ba7 -s ours am: d8d91fde -s ours am: 2e30cd02 -s ours am: b1fa1f5f -s ours

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

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



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