[automerger skipped] DO NOT MERGE am: a31fad611d -s ours am: e17cff534e -s ours am: 1e97b93ba9 -s ours am: 4389f50f86 -s ours am: a48caa922b -s ours am: df0ca773b4 -s ours am: b67a78e0a0 -s ours

am skip reason: subject contains skip directive

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

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