Merge changes from topic...

Merge changes from topic "presubmit-am-c1c9b4132e054e448d09ccc0ea083868-sc-qpr1-dev-sc-dev" into sc-mainline-prod am: acb4c9b7

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



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