Merge changes from topic "presubmit-am-af15b7fb137442c3a62a25c0a6389cfa" into sc-qpr1-dev am: a94df207

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

Change-Id: Ib5256200606af928f367602d56e19fb3840c1d06