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

Merge changes from topic "presubmit-am-fa6802abdeff4b8ea35356d58a58bda6" into sc-qpr1-dev am: 5f90e5cd

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

Change-Id: I9fec1532c2d3b65e926504e60c3c69c3a6c2f59f