[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: a43538ed -s ours am: 222150ab -s ours am: 6223be59 -s ours

am skip reason: subject contains skip directive

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



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