[automerger skipped] DO NOT MERGE am: 945e78f9 -s ours am: e5f1e4a6 -s ours am: 2a4c5f99 -s ours am: b404b9d4 -s ours am: f887e195 -s ours am: 06211d20 -s ours

am skip reason: subject contains skip directive

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



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