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

am skip reason: subject contains skip directive

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



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