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

Merge changes from topic "presubmit-am-e981430fb42a480e9e40b7ef0b292a51" into sc-qpr1-dev am: 59aee8fb

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



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