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

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

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

Change-Id: Ifb65a748babf33f45364f8e2931c3b4f3d82724f