[automerger skipped] Merge 10952656 am: 8a5dadb7 -s ours am: 5413555d -s ours

am skip reason: Merged-In I0a7233e0124a8c4defac51baa1a001fdbefeb4eb with SHA-1 63ca34ef is already in history

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



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