Merge changes from topic...

Merge changes from topic "presubmit-am-2613dc5aeb9b4fa1a17905710745009a-sc-dev" into sc-qpr1-dev am: af5c39e7 am: 255a79d3 am: 6f858f96

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



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