Merge changes from topic "presubmit-am-fbfa3bdd2cb9460bb4af78a6f252a34b" into sc-mainline-prod am: 819a069a

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

Change-Id: I0afadfbd5bc6b097e35644fc99ab3350f6479ada