Merge "Use finally block for Binder.restoreCallingIdentity"