Merge "Remove unused qs_peek_height, redundant height method" into udc-qpr-dev am: ffd42777

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



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