[automerger skipped] Merge changes I30579090,I7a725647 into tm-dev am: fb0f85333c am: bdf07ba75f -s ours
am skip reason: Merged-In I30579090c803b231fd750abbc4ad645805f7ece2 with SHA-1 a5c6abbdf0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21253698
Change-Id: Iac330e252e1dae84aee1cdfcdac5b35ac8b80445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: