Merge changes from topic "presubmit-am-bbf213f141924072ae886cc03356ffb5" into sc-qpr1-dev am: f6d5da7d28 am: eba8cbcb86 am: d4843ce9c9

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

Change-Id: I9be9859579894e299528742bb727e56780f1640c