Merge changes from topic "presubmit-am-9e239470faa64ffd8902a892e6f1ea47" into sc-qpr1-dev am: 1eb694a2 am: 370a59f8

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

Change-Id: I31676a49d0b12c40c32779029bafa99d3c356ca3