[automerger skipped] Fix a bug where 1.3 Device ignores 1.3 capabilities am:...

[automerger skipped] Fix a bug where 1.3 Device ignores 1.3 capabilities am: 77e06d86 am: 5908f736 am: 71c8e132 -s ours

am skip reason: Change-Id I476c7ab6ae807b4fd3ed27ec4d63aa6c04d0c7e1 with SHA-1 d594cd0a is in history

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

Change-Id: Ifff142e594ae371a8243abed7ab9fee9abf4615e