[automerger skipped] DO NOT MERGE am: e9ec3227 -s ours am: e3b2d76c -s...

[automerger skipped] DO NOT MERGE am: e9ec3227 -s ours am: e3b2d76c -s ours am: 616d79af -s ours am: a3fd4316 -s ours

am skip reason: subject contains skip directive

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



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