Merge "Clear calling identity before binding instant app resolver" into oc-dev
am: 247b9c4a0a

Change-Id: Ib2f5fe61384d763a9504422e92f8a1fca4624248