[automerger skipped] Merge "Per-app config for split screen aspect ratio" into...

[automerger skipped] Merge "Per-app config for split screen aspect ratio" into tm-qpr-dev am: fe7a283d am: e454f1f4 -s ours

am skip reason: Merged-In I0232d6d98b10e546b840c08ffbf6e7be9c465965 with SHA-1 209d86a4 is already in history

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



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