[automerger skipped] Merge "Add TV splitscreen menu" into tm-qpr-dev am:...

[automerger skipped] Merge "Add TV splitscreen menu" into tm-qpr-dev am: f73ff9ec am: 38b3423b -s ours

am skip reason: Merged-In Iac17445414a190c91ccd407d67f0f8c29d6bd4bf with SHA-1 7ab2a40d is already in history

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



Change-Id: Ie48ebde200d9e6df9138cf26a982e467b3905f71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>