[automerger skipped] Merge changes I3ba50cbd,I970ee365 into sc-dev am:...

[automerger skipped] Merge changes I3ba50cbd,I970ee365 into sc-dev am: b987babf -s ours am: b36d95d8 -s ours

am skip reason: Merged-In I3ba50cbd8a7f60779c69ba85e10dc3cc8a52f8b1 with SHA-1 dd31fddc is already in history

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

Change-Id: I5ab7a94fc84840d4feaf2d558167332b7af946dd