[automerger skipped] DO NOT MERGE am: a31fad611d -s ours am: e17cff534e -s ours

am skip reason: subject contains skip directive

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

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