Merge "Respect minimum dimensions for embedded Activities" into tm-qpr-dev am:...

Merge "Respect minimum dimensions for embedded Activities" into tm-qpr-dev am: cc0966bf am: 3b35b433

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



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