Merge "Merge "Use try-with-resources to avoid accidentaly leaking unclosed...

Merge "Merge "Use try-with-resources to avoid accidentaly leaking unclosed objects." am: 943c640d am: 7d07b014 am: 24bb2264" into udc-dev-plus-aosp am: 320254a2 am: 3a32cc70

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2545531



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