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

am skip reason: subject contains skip directive

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

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