Merge changes from topic "presubmit-am-344b69221da94b53953e04620bfe4930" into sc-mainline-prod am: 4f601f3a

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

Change-Id: I53d90cce6aec098a36a8e9d6c8f0fae8f71c5085