[automerger skipped] DO NOT MERGE am: 277e7e0586 am: 903db9a032 am: 74ac9a9085 -s ours

am skip reason: subject contains skip directive

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

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