[automerger skipped] Merge "Respect minimum dimensions for embedded Activities" into tm-dev am: eb86759e am: 8671151a -s ours

am skip reason: Merged-In Ib46c2cec2a0735b9e3f3420f2cb94754801b86b9 with SHA-1 482fbfab is already in history

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



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