Merge changes from topic "nativehandle" am: d0fd93097c

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

Change-Id: Id418a51aee8c7258a16c2ef69cf1a412745c4463