Merge "Backporting the change of ag/15629060 to rvc-dev" into rvc-dev am: 964ddbbb am: d08e9f5a

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

Change-Id: I135a78830543f0d840bda4671f746181137a7b4d