[automerger skipped] Merge "Report folding features to letterboxed apps." into...

[automerger skipped] Merge "Report folding features to letterboxed apps." into tm-qpr-dev am: 59853012 -s ours am: 89185b1f -s ours am: f0f6c941 -s ours

am skip reason: Merged-In I427f0bc23f00d245c5093c75f13c9e533209362e with SHA-1 3e428597 is already in history

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



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