Merge changes from topic "presubmit-am-504234806e1c41a3a3385318752273e8" into sc-v2-dev-plus-aosp am: 919c2b07

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

Change-Id: Ia86bee05e191ac950412517350827dfe84391b29