Merge changes from topic "presubmit-am-64e6e8709f7d4e6a844c50eac8f28918" into sc-v2-dev-plus-aosp am: 14374e5097

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

Change-Id: I82e672fd3f4ee6e1bbf6edff1020fef07ee5781d