Merge "Changes in tvsystem/ DeviceProductInfo to mirror changes in frameworks/base/ DeviceProductInfo" into sc-dev am: 344a0b4d7a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I599f23e623d3f6e865e1dc231e8a28fc32846bc6
tree: e3a07cb7a9ef549582f7207648c4b8d4f07c7026
  1. api/
  2. java/
  3. Android.bp
  4. OWNERS