Merge changes from topic "presubmit-am-4b65c4c86e044cc1a5997f5736d8d1ba" into...

Merge changes from topic "presubmit-am-4b65c4c86e044cc1a5997f5736d8d1ba" into sc-qpr1-dev am: d4d7eb43 am: 318fdb36 am: 1f76ba9a

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

Change-Id: I07b5346132c844b855b6b21126155ee8c26fe85b