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

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

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



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