[automerger skipped] Merge changes from topic "presubmit-am-090cf7e478c84477974f163c98e38b8f" into sc-qpr1-dev am: a2749699ae -s ours am: efcf9574af -s ours am: af58bc8949 -s ours
am skip reason: Merged-In Ib3bda769c499b4069b49c566b1b227f98f707a8a with SHA-1 7505c570ff is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22096945
Change-Id: I948b366f51c2fca1aa3854700ac3ea9501431865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: