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

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

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

Change-Id: I5f42c9ff6f4ac48be817cbed6abfa6bb01f9d447