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

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



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