[automerger skipped] DO NOT MERGE am: 3f218c9a5e am: e0243c7661 -s ours am: a7fd96bf38 -s ours am: 6059e668f9 -s ours am: ee69188241 -s ours am: dccf456b70 -s ours am: 1c8d44952b -s ours

am skip reason: subject contains skip directive

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

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