[automerger skipped] DO NOT MERGE am: 5c3d1dceb0 -s ours am: 8499a1e3ce -s ours am: 6666fd9eb1 -s ours am: f5d96cc032 -s ours

am skip reason: subject contains skip directive

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

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