Merge changes from topic "presubmit-am-02e1f9eca09a4c4c9ff2ae6cc54927d9" into sc-qpr1-dev am: 7868551705 am: 048acf5e8f

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

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