[automerger skipped] Merge changes from topic...

[automerger skipped] Merge changes from topic "presubmit-am-b1e9c1f0750d47e9be992038522e27c5" into sc-qpr1-dev am: 92145ceb -s ours am: 9a1d8b1b -s ours

am skip reason: Merged-In I2617de6f9e8a7dbfd8fbeff589a7d592f00d87c5 with SHA-1 fee62a33 is already in history

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



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