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