[automerger skipped] DO NOT MERGE am: aa58f990 -s ours am: 17acc1cf -s...

[automerger skipped] DO NOT MERGE am: aa58f990 -s ours am: 17acc1cf -s ours am: 1db76abd -s ours am: 2cabafa6 -s ours am: 779ca928 -s ours am: 639cb558 -s ours am: c63150f8 -s ours am: c8437f84 -s ours

am skip reason: subject contains skip directive

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



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