[automerger skipped] Merge "Remove TvSystem from prebuilts/sdk" am: 6698624465 am: 6795250739 am: e2a5e1e9b4 -s ours

am skip reason: skip tag Change-Id Iad5eb37998469ad7c382a726e83b5c86e31a7a70 with SHA-1 150585ef93 is already in history

Original change: https://android-review.googlesource.com/c/platform/prebuilts/sdk/+/1650447

Change-Id: Iec61f9ceaf9bab37c2b6dbd71aca99711807a156