Merge changes from topic "atv-rro" am: 821b08ecf6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I38a7799b4e353ac38af06a2c3b28301a28d23950