Merge "Fix TV didn't initiate ARC sometimes." am: 89e7e85f06

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

Change-Id: I3f98bf71b199b1bad7b41e11750317c84d79cf0f