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

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



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