Merge changes I06d91234,I8a195b3e into rvc-dev am: 5a53824868 am: a0e91a15fe am: 9402b76a5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11936027 Change-Id: Ie2a81b174e63ad3598437458661401af1b6e895c
This commit is contained in: