[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: c1159055 -s ours am: 4db23c54 -s ours

am skip reason: subject contains skip directive

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



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