[automerger skipped] Merge changes from topic "presubmit-am-5d70d7e9c9634af1b0b082cbc89e0dad-sc-qpr1-dev-sc-dev" into sc-qpr1-dev am: 082b55bd3f -s ours am: a413c4e721 -s ours
am skip reason: Merged-In Id69b671592396ac3304862dadbe73de328a8e27a with SHA-1 5c344d8a1f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19868479
Change-Id: I3e764bb0e74263b28238ce43aaa5e1833635c594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: