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

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



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