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

Merge changes from topic "presubmit-am-fa1b923d0a2b4f13852b0692eaab9b08" into sc-v2-dev-plus-aosp am: 054580ab am: e33bc6a9 am: bcd79531

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

Change-Id: I2f7d8ef961934ce05fa8a2787d92a9e396353290