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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib081b232aa2e3ce8f8e8d7fd04ecb59ca2e27d11