Merge changes from topic "presubmit-am-c36a899a15cc428c9d8f898ef539dfc2" into sc-qpr1-dev am: 58b23faf am: 206f4971

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

Change-Id: I0a3ba89ff090f001e69efaf11521bc2a105f8580