Merge changes from topic "presubmit-am-5f95fe6e5a284ed0b7c60c57bf8c4a20" into...

Merge changes from topic "presubmit-am-5f95fe6e5a284ed0b7c60c57bf8c4a20" into sc-mainline-prod am: 1ca37379

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

Change-Id: I652c6f2f297d86a0d1abc83386213d06446074db