Merge changes from topic "presubmit-am-1b5cf7c12da84505927afb0314fbb5cf" into sc-qpr1-dev am: d3f77028 am: 4e4bf29c

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

Change-Id: Ia188b190443a291d11e2b2610afb4ec0f5d9a928