[automerger skipped] DO NOT MERGE am: e10cae158a -s ours am: 0010edd0a5 -s ours

am skip reason: subject contains skip directive

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

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