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

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

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



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