[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "b-295785410-report-folding-features-to-letterboxed-apps" into udc-qpr-dev am: 5f483e0d -s ours

am skip reason: Merged-In Ia079d06a403a59bb0f1eafdaad6ce238749a2af2 with SHA-1 852dd9d8 is already in history

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



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