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