[automerger skipped] DO NOT MERGE am: c48f5407d5 am: a2392101e4 -s ours

am skip reason: subject contains skip directive

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

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