[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-994c84d568054c049282d3d0e9c67263" into sc-mainline-prod am: 27ca7443 -s ours am: 81561d14 -s ours am: a3ba3cc6 -s ours

am skip reason: Merged-In Iac143d8bbc9422f3ca3f42f8c0154b9906ecd897 with SHA-1 7319e40b is already in history

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



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