Merge "Don't check height if activity bounds empty" into tm-qpr-dev am: f2d3b4a5 am: 700202fe am: dcd1f47a am: b97a2f68

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



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