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

am skip reason: skipped by user aseemk

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

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