[automerger skipped] Skip letterboxing if the activity below is embedded am: ad7d89c2 -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: I99e70eeb5d78dd5b65e607e6d4cc7995586acab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>