Merge "Merge changes from topic "jun2" into rvc-dev am: 3dce721a am:...

Merge "Merge changes from topic "jun2" into rvc-dev am: 3dce721a am: e73e5876 am: 683d30fb" into rvc-qpr-dev-plus-aosp am: a36e7f75

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11707940

Change-Id: I8703735168021ca1ba0f77738118aa8bcd11c5bf