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

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



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