[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: 19976cb6 -s ours am: fd21bc37 -s ours am: fe7dec7f -s ours am: a5fbfba8 -s ours am: c99619ff -s ours

am skip reason: subject contains skip directive

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



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