Merge changes I30a2fa4f,I1abd1561 into rvc-dev am: 5bbeb33ec9 am: c3d6c2815a am: ae8b76402a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11966041 Change-Id: I58b2993baf0c6743fe9c29d6dce2d711c67d193c
This commit is contained in: