Merge "Add android-5.10 support for S" am: 69c290564a am: d694491190 am: 14172a0744

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5b7a414b08abc9a57338af40a387dfbd45f63528