Merge "Clear calling uid before changing whitelist" into oc-dev
am: 97e3db9aee

Change-Id: Icc858733afb22720a9adf1a1c4e85ba47cf03e2d