Merge changes from topic "presubmit-am-a10436ba523c443696b70308db2adac6" into...

Merge changes from topic "presubmit-am-a10436ba523c443696b70308db2adac6" into sc-mainline-prod am: 1b4c92dc am: 64bce073 am: 84fccf6e am: 6a1bf68d am: 82b86154

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



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