[automerger skipped] DO NOT MERGE am: c48f5407d5 am: a2392101e4 -s ours am: 30fab5ced8 -s ours

am skip reason: subject contains skip directive

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

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