Merge changes from topic "presubmit-am-6e2d2013d117441baf471cd8f74a86ef" into sc-qpr1-dev am: 33503d59 am: 3cd71529 am: fd6082a5

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

Change-Id: I76b96e93461861237be9cec237b3d289084c2643