Merge changes from topic "presubmit-am-1bbd0f65340f4740a2eb6e4b49c5bdca" into sc-qpr1-dev am: abfea44d

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

Change-Id: Ia532bafe104430e183a722e9f9b9a32c69dbb1c9