Tighten up Binder.clearCallingIdentity() usage.

This is a second CL in a chain that fixes minor fallout from the
previous CL which was purely mechanical.

Bug: 155703208
Test: make
Exempt-From-Owner-Approval: trivial refactoring
Change-Id: I38e924a8061dc7a1194003412c46df29c13fb035