Merge changes from topic "am-33470befccb74b399ba8484212c404fd" into sc-v2-dev-plus-aosp am: b6fb4ebf

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

Change-Id: I7d7a69727310cc8c90f6a6c70f6d366738ddea01