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

Merge changes from topic "presubmit-am-4b65c4c86e044cc1a5997f5736d8d1ba" into sc-qpr1-dev am: d4d7eb43 am: d7df7192 am: c62340fe

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

Change-Id: I6876967f54cba5e317582f29664bbb5b6ad68d68