[automerger skipped] Merge "[2/n] Integrate OptPropBuilder in...

[automerger skipped] Merge "[2/n] Integrate OptPropBuilder in LetterboxUiController" into 24D1-dev am: 4875bc2f -s ours

am skip reason: Merged-In Id5ccfb6fc0461fcd93c2756e55b8b74d29add53d with SHA-1 65231dc6 is already in history

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



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