[automerger skipped] Merge changes from topic "nativehandle" am: d0fd93097c am: 19de4b7e04 -s ours

am skip reason: Change-Id Ie1d92a50dddf7e3e1bd473e2a957279c6dadb865 with SHA-1 926aa80f04 is in history

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

Change-Id: I20f24252c3aea1c1b9d01cdee5b4c12d1a09d890