Merge changes from topic "presubmit-am-97f49dd1a76949539332751ae071ebdc" into sc-v2-dev-plus-aosp am: 2638f38f75

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

Change-Id: If364f10cae7dabf3e4cc390e80ec79f0324dbfa5