[automerger skipped] Merge "Use finally block for...

[automerger skipped] Merge "Use finally block for Binder.restoreCallingIdentity" am: d6eba767 am: b0f4798d -s ours

am skip reason: Merged-In I2dd4cfc1aacecb0b77fa4c82b48b24b284271779 with SHA-1 5ffaea94 is already in history

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

Change-Id: If2a4fb347f82c6615939c86bc79d3632f7270535