Merge "Revert "Revert "Binder.restoreCallingIdentity moved from 'catch' to 'finally' block."""