[automerger skipped] Merge "Clear calling identity when executing the callback" am: 9fc2483fb4 am: 245423f31f am: 3f1f75ad07 -s ours
am skip reason: Change-Id Ie50315e3fd287559ed516a24de09af6707c03d2f with SHA-1 86de2275b4 is in history

Change-Id: I731fea95bf2d77fb8bdef0ace6f00f05e9ea2033