[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-994c84d568054c049282d3d0e9c67263" into sc-qpr1-dev am: d1fc9720 am: 132b0d2d -s ours am: 25e63353 -s ours am: f21ac4cf -s ours

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

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



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