Merge changes from topic "presubmit-am-b00871d458704c1fb87bef19037bf9bf" into sc-v2-dev-plus-aosp am: ee17cca5

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

Change-Id: Ic80350026950c2ec0ed3cfaae3b15e5a159516b7