Merge changes from topic "am-f18fb677b15e4dacac59d4a154406f6a" into sc-v2-dev-plus-aosp am: 72afe183

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

Change-Id: I0f687c38ebe54f9bd17be62c49056966e56dcd24