Merge changes from topic "b-186518774" into sc-v2-dev-plus-aosp am: 45852c2567 am: e53df72359
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16932214 Change-Id: I2918590772437723aa200863c55488c6403d0f03
This commit is contained in: