Merge changes from topic "presubmit-am-821d6efded8a499dbc4f84363a0f60f9" into sc-qpr1-dev am: efafc988 am: c2e3b1dc am: a23f1a3e

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

Change-Id: Id8538cb738e5429c66dda9325e022adca046022c