Merge "Use a randomly generated UUID as the TvInputSessionId" am: 4249ba1059 am: 0578400adb

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I59ff15b3452f812fa1cb5d7dffe71e4049477ca9