Merge "In backup/restore code wrap Binder.restoreCallingIdentity() in finally{}."