[automerger skipped] Merge changes from topic "atv-rro" am: 821b08ec am:...

[automerger skipped] Merge changes from topic "atv-rro" am: 821b08ec am: afc49085 am: ebabaab0 -s ours

am skip reason: Change-Id If9a99f850ebb34755b4146b786c189f9fb590c3d with SHA-1 6335ad65 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e70d0959c2a4f607c8f27bded3d548439954287