[automerger skipped] Merge changes from topic "nativehandle" am: d0fd9309 am: 19de4b7e -s ours am: efbc8406 -s ours am: 806c8613 -s ours

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

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

Change-Id: Ia08b2f21c696c70d4926e212c7ab86dfe19cab59