[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: 3dd89f72 -s ours am: 1929bf4f -s ours am: 0b0e61b5 -s ours

am skip reason: subject contains skip directive

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



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