Merge changes from topic "presubmit-am-821d6efded8a499dbc4f84363a0f60f9" into sc-qpr1-dev am: efafc988 am: 478f9e6f am: b13dd5b2

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

Change-Id: I6791bf26214740531811ac4e74109bf73d55cb7a