DO NOT MERGE - Merge RQ1A.201205.011 am: c371fcd552

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

Change-Id: I74c674d04759ae39b0f6356a049511c06dc29ed0