[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: 074e39a7 -s ours am: 241d2483 -s ours am: 3560dd96 -s ours am: cc6376db -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: Ica7b4a9bfb4a8bac214fe1a0f19210cf91a7fd6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>