[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-0d13c95295c446889fc51032ba336d89" into sc-qpr1-dev am: 459761c7 am: 6e59db19 -s ours am: e8c7544c -s ours

am skip reason: Merged-In Id262b9a0de58d8834c85d925cf84bb44b8b99742 with SHA-1 e41e04bb is already in history

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

Change-Id: I63a063c92bba35c7a3c4ae6ff13dcf4f8e9a0355