Merge changes from topic "presubmit-am-d7178652ff24438db859a4dbafaa0453" into sc-v2-dev-plus-aosp am: 96290817b8

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

Change-Id: Idf378c5c5446f5bacb4a9fb12afb6332f97acef1