[automerger skipped] DO NOT MERGE am: e10cae158a -s ours am: 0010edd0a5 -s ours am: d6b38d88b9 -s ours am: 4e0c1a9f71 -s ours am: 683c98591a -s ours

am skip reason: subject contains skip directive

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

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