Merge changes from topic "b/159260556" into rvc-dev am: 5731877f1e am: 2738860066 am: b14a5631c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905665 Change-Id: Iff87da0d768e05aa251173c19865593873f15f71
This commit is contained in: