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

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



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