[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-596ac78c570647d8a0f30d123eb656a7" into sc-qpr1-dev am: f943201e am: e527f6bc -s ours am: d43e0457 -s ours am: 18b278f5 -s ours am: d77eec1a -s ours

am skip reason: Merged-In Idcf54e408722f164d16bf2f24a00cd1f5b626d23 with SHA-1 5dd3e813 is already in history

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



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