[automerger skipped] Mark RP1A.200720.001 as merged am: 380a862b -s ours am:...

[automerger skipped] Mark RP1A.200720.001 as merged am: 380a862b -s ours am: 7c62601b -s ours am: 7fcc589e -s ours

am skip reason: Change-Id Ic3b7ee64244f03625af7cd2aea055f31febdb19d with SHA-1 c12559f7 is in history

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

Change-Id: I78b6edba2d2714cbb344312a3ae34a916a41d536