[automerger skipped] Merge changes I1de322c9,Id0983d4b into sc-dev am:...

[automerger skipped] Merge changes I1de322c9,Id0983d4b into sc-dev am: 453acbbf am: c82e4d23 -s ours am: 6aac371c -s ours

am skip reason: Merged-In I1de322c95aacc8924e95bcdbcfdbd1ec441de99c with SHA-1 ff411215 is already in history

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

Change-Id: I045454dc636129c889e8f97fe1a89b297d806e5a