[automerger skipped] DO NOT MERGE - Merge RQ1A.201205.011 am: c371fcd552 am: ad31d882f0 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/13177006

Change-Id: I5c8b07e66fb7268be22d25e50b85f5d41e7e3f3f