Merge "Backporting the change of ag/15629060 to rvc-dev" into rvc-dev am: 964ddbbbcc am: d08e9f5aad am: 9d17f35793
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15750102 Change-Id: Ic2f896e0a5b974a56f825cce0dcceea2b467c462
This commit is contained in: