[automerger skipped] DO NOT MERGE am: c48f5407 -s ours am: 01d3fa31 -s ours

am skip reason: subject contains skip directive

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



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