[automerger skipped] DO NOT MERGE am: c48f5407 am: a2392101 -s ours am:...

[automerger skipped] DO NOT MERGE am: c48f5407 am: a2392101 -s ours am: 30fab5ce -s ours am: 18b545fd -s ours

am skip reason: subject contains skip directive

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



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