Merge changes I9acb1145,Ie1bc4a92 into rvc-dev am: 2ca72c4756 am: 019c8a6fce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11990823 Change-Id: Ia228fe6edb68b99218743b2f81446ff20ca194d7
This commit is contained in: