[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: f91aab24 -s ours am: 1f523199 -s ours am: 08a717d4 -s ours

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

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



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