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

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

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



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