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

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

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



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