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

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