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