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