Merge "Fix TV didn't initiate ARC sometimes." am: 89e7e85f06 am: 14abda59dd am: 6a4f7c695c

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

Change-Id: Iac2c370e088b80dcadd67c86f309910d1796cb81