Merge changes from topic "presubmit-am-af15b7fb137442c3a62a25c0a6389cfa" into...

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

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

Change-Id: Ib2013d143e670b7178c38f4eb3740da295a92dc3