[automerger skipped] Merge changes from topic "sb_height" into...

[automerger skipped] Merge changes from topic "sb_height" into sc-v2-dev-plus-aosp am: 6f23b6d3 -s ours am: ddc11487 -s ours am: d2692e6d -s ours

am skip reason: Merged-In I306efa187ffa69223c06fd248cfe57d183f96c59 with SHA-1 e9019422 is already in history

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



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