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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic7ebf0f366a817434e7bc2d51497c7e33ffa459b