[automerger skipped] Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE am: 10d58f6f16
-s ours
am skip reason: Change-Id I0d1d88bf6aca3324e8348642aa7e77aa663ba806 with SHA-1 c9a594fc65
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/12579467
Change-Id: Id7e2f311521a3ed67faabaf926052425792b8823
This commit is contained in:
commit
dab2441bcb