Merge changes from topic "b/159260556" into rvc-dev am: 5731877f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11905665

Change-Id: I3ad2e1a55d61fe1f728aec688a81552ad129f9b5