[automerger skipped] DO NOT MERGE am: 5c3d1dce -s ours am: 8499a1e3 -s ours am: 9d33be49 -s ours am: b9448df2 -s ours am: 20983bf5 -s ours am: 7a5ef126 -s ours am: 9f2521dc -s ours

am skip reason: subject contains skip directive

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



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