Snap for 6948038 from e9210ca688c58ec961456b6601a87d245bd69eba to rvc-platform-release am: 17c1ffdc5d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/tv/tvsystem/+/12979319

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7e634542aca9645a1114d91d99dc99acead69c89
tree: c45e98e7f8b8888658a589b1ac4e808862e2cf8a
  1. Android.bp
  2. api/
  3. java/