DO NOT MERGE - Mark RQ1A.201004.001 as merged am: 528369f35d

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

Change-Id: I2c8e89b0feed7277c8fa526ab507bd11ba3786b6