Merge changes from topic "presubmit-am-eaa97beb2f6a4393b8a652f43ac1a987" into sc-qpr1-dev am: ff364396

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

Change-Id: Ib119cd3d797e5d07226a14585768a1d4cabda33a