Merge changes I4fdf368e,Ibc6be890 into rvc-dev am: 48dc192499 am: 04fb24d142 am: 76f777eb3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11932511 Change-Id: If0ac495d20152ccbe5f7b98d0bd9ce9dcc5616da
This commit is contained in: