Merge changes from topic "presubmit-am-596ac78c570647d8a0f30d123eb656a7" into...

Merge changes from topic "presubmit-am-596ac78c570647d8a0f30d123eb656a7" into sc-qpr1-dev am: f943201e

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



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