[automerger skipped] Merge changes I30579090,I7a725647 into tm-dev am: fb0f85333c am: c351acabe5 am: 1ee97e0e8a -s ours

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

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

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