[automerger skipped] Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918 am: 9fb33388af -s ours am: dc51f278a1 -s ours am: 99ec6d7c6b -s ours

am skip reason: Merged-In I637b82fd2c57ac45b5c28b74941cf1c80235e844 with SHA-1 ba5e8ed70b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/common/+/16274657

Change-Id: I4ca01ece7bc0bd476cacbb8eb4ac3f5607a1749f