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

Merge changes from topic "presubmit-am-a0f887f302784f8c86331d3e0819fa21" into sc-qpr1-dev am: 82e2fcfd am: 632ac319

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

Change-Id: I7b76db3f0d3bccffa4b53bc3b12a5c9d5d9471ad