[automerger skipped] Merge "Use a randomly generated UUID as the...

[automerger skipped] Merge "Use a randomly generated UUID as the TvInputSessionId" am: 4249ba10 am: 0578400a am: 4a114844 -s ours

am skip reason: Change-Id I4369e2645b50d44803f2d393798fa5ea6d1c22bd with SHA-1 028023b9 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2bed8b78025bc1cf09aee4a42455b6941628bbf