[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-be77b49cb4954373beb6c8cf4e1baecc" into sc-qpr1-dev am: 2529e2db -s ours am: 1beb11d5 -s ours

am skip reason: Merged-In I9c681106f6d645e62b0e44903d40aa523fee0e95 with SHA-1 c23f14f8 is already in history

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



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