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

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

Change-Id: Ibd2f5292100d4f68da4940f7117c2a2428e54d72