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

Merge changes from topic "presubmit-am-e3c1888c62794717b02f19ce77d046a6" into sc-qpr1-dev am: 0dc764cb

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

Change-Id: I46d567387d6c08e5413741477f7867433a4cd6b8