Merge "Close native handle properly." into tm-dev am: 3e9c1ac8 am: c5cfdd9b am: a785e1df

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/17917764



Change-Id: I5aab9c9a264ec9bf7fb6178dc28734cd1ca1ea73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>