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

Merge changes from topic "presubmit-am-cb3c43babe4c45069e5619a744950e15" into sc-qpr1-dev am: 214ad884

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



Change-Id: I97c8f7a192e7c6bf75426e459c1eb40c7773370b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>