Merge changes from topic "am-83b6c5c4674140e98078dbf0aa8c8cc1" into sc-v2-dev-plus-aosp am: 044ffd8a

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

Change-Id: Ic4d289689dcd116c9ab1414156d4fb7086d434c1