[automerger skipped] Merge "Respect minimum dimensions for embedded Activities" into tm-dev am: eb86759eec am: 8671151aee am: f4733cfa0e -s ours am: dde41aa812 -s ours
am skip reason: Merged-In Ib46c2cec2a0735b9e3f3420f2cb94754801b86b9 with SHA-1 fa3f9ca94c is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18482931
Change-Id: I80cf8d492cdde432ad714229bd9d6d1e0ce66035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: