Merge changes from topic "presubmit-am-fbfa3bdd2cb9460bb4af78a6f252a34b" into sc-dev-plus-aosp am: d8254d87

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

Change-Id: I98f33f5fc9219f58920cd4261ae9f14241ff51c2