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

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



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