Merge changes from topic "presubmit-am-02e1f9eca09a4c4c9ff2ae6cc54927d9" into...

Merge changes from topic "presubmit-am-02e1f9eca09a4c4c9ff2ae6cc54927d9" into sc-qpr1-dev am: 78685517 am: 048acf5e am: a6bae7d9

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



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