[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "am-48fce8054ea84f449c45918497754b47" into stage-aosp-master am: 5625f26c -s ours am: a5e51cb8 -s ours

am skip reason: Change-Id Ife05ba75a3f23d0c18b3aa068881b6646dee6db5 with SHA-1 89667c6b is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I72c6d2936c1d590eb8c42ac62fcf5af8de5df20f