Merge changes If8d5b906,I861d6ef7 into rvc-dev am: 70f970f80b am: 9848ecebd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11871517 Change-Id: I094a7130d02cfad0b7e9a7619dc234193a2d612e
This commit is contained in: