[automerger skipped] Merge "Merge RP1A.200720.011" into stage-aosp-master am: 5b0fb0dc5f -s ours

am skip reason: Change-Id If6721904a50f164626d30460a2b13c59ffd2814f with SHA-1 f65abbd1c8 is in history

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

Change-Id: I905e4741f908818cfb57d0d3e0d7df3b9522bc87