Merge changes from topic "presubmit-am-aa055fd7a8a84c0ebcfface10787a9e8" into sc-mainline-prod am: 58bf41e9

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

Change-Id: Iad95aa015ef1d8efeca6d2fe0cf441f3134ad4ec