Merge changes from topic "presubmit-am-feedd56083be48668fea14c29cf72287" into sc-v2-dev-plus-aosp am: 01ecac98

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

Change-Id: I6fd3376ef302f740d341f72762c59a89ecaa0dac