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

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



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