Merge changes from topic "presubmit-am-361ce2f2beb3432cae0398341bab71ca" into...

Merge changes from topic "presubmit-am-361ce2f2beb3432cae0398341bab71ca" into sc-qpr1-dev am: 324903d9

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



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