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