Merge changes from topic "presubmit-am-6290ab08962e4de2a1b7459b37584f7c" into sc-qpr1-dev am: 80474f46 am: 43e941e4 am: ddb21da2

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

Change-Id: I7ca9432ee7dce3ace0537b1175572bdf54373bbf