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

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

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



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