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

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

Change-Id: Iabe1cee40e941e8d7d48ce5644bf308b369800c6