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

[automerger skipped] Merge "Merge RP1A.200720.011" into stage-aosp-master am: 5b0fb0dc -s ours am: 71d651b7 -s ours am: a515ba23 -s ours

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

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

Change-Id: Iabb64d0afc59e4f4a82ba98148e7292af8f18671