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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1c8bdfcf758b38cc1b4929792c794ccd497aae71