Merge changes from topic "presubmit-am-2e7f765efd5f4949a381b8eb282b2dcc" into...

Merge changes from topic "presubmit-am-2e7f765efd5f4949a381b8eb282b2dcc" into sc-v2-dev-plus-aosp am: a5131655

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

Change-Id: I90d5071b2d43929db11173908e255c0b475c17d7