Merge "Use try-with-resources to ensure input stream gets closed." am: 7b3cddac9c am: a517a8e111

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/2605665

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