[automerger skipped] DO NOT MERGE am: 0b672c0a5f -s ours am: c52ea5cbc7 -s ours

am skip reason: subject contains skip directive

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

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