Merge changes from topic "sbHeight" into sc-v2-dev-plus-aosp am: 7337802a am: 24eb4b55 am: 506cf504 am: 5a384432

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



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