[automerger skipped] Merge changes from topic "sb_height" into sc-v2-dev-plus-aosp am: 6f23b6d3ff -s ours am: ddc1148737 -s ours
am skip reason: Merged-In I306efa187ffa69223c06fd248cfe57d183f96c59 with SHA-1 e901942281 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17527092
Change-Id: I08a37671c9a4cfdd97395f72ac467aa04a1125c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: