Merge changes from topic "presubmit-am-8134571e02a14812820dc4626241cf6f" into...

Merge changes from topic "presubmit-am-8134571e02a14812820dc4626241cf6f" into sc-qpr1-dev am: ba36fd90 am: 74dd009a

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



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