Merge changes from topic "presubmit-am-8fce4e975b58476c9f42996d277b3173" into sc-dev-plus-aosp am: 7a3563b9

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

Change-Id: I210041bd217a7974131ff7ec24e66f0aa92b50a2