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 am: 5e2f6474 am: 20aa07fb am: 5723cd56 am: ba399044 am: 60b17a73

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



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