Merge "Remove clear/restore callingUid" into rvc-dev am: 3dd11b7958 am: c42b11562b

Change-Id: I397000a2baaaadf5269ba3f997bac8e084b54585
tree: 68d8428c97e67001437546f54c764b93303cf84b
  1. apex/