Merge changes from topic "presubmit-am-d8e1f50ef5264701a2f9994dfc715425" into...

Merge changes from topic "presubmit-am-d8e1f50ef5264701a2f9994dfc715425" into sc-v2-dev-plus-aosp am: fa749e73

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

Change-Id: I81679315c79c70308fab2b8690719bc5c4eda93a