Changes in tvsystem/ DeviceProductInfo to mirror changes in am: b309e350d4

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I746178320a37ad55857d51edabcab7ef41c9542a
tree: 720ac25c1882c6f3c3a9d0c3812e57c476053f49
  1. api/
  2. java/
  3. Android.bp
  4. OWNERS