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