[automerger skipped] Merge "Skip letterboxing if the activity below is...

[automerger skipped] Merge "Skip letterboxing if the activity below is embedded" into tm-qpr-dev am: 53b8173a -s ours

am skip reason: Merged-In Ic7b1c4b40960fd04de9efbf4f6d7abee45c93025 with SHA-1 ad7d89c2 is already in history

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



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