Merge changes from topic "presubmit-am-892bfeed2a87403cb4f8a1675e774b12" into sc-qpr1-dev am: da88ad66 am: fd813a24

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

Change-Id: If3fa7e2eab01e72ff54321b13373bb95dca75a29