Merge changes from topic "sbHeight" into sc-v2-dev-plus-aosp am: 7337802a28 am: 24eb4b556e am: 506cf504ac
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17686875 Change-Id: Id98c6870d775854ff5beacb836cffa6e62d18775 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: