Merge changes from topic "presubmit-am-e013d0dff34944bd9549ed99021c47fa" into sc-v2-dev-plus-aosp am: eba93191

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

Change-Id: Ie8a9fcd121e0c659a24706fdb31aa3599381e1ee