DO NOT MERGE: Revert "DO NOT MERGE: Revert "Allow mocks to call blackisted APIs""
am: 314cb2efb7

Change-Id: I8715c9ccee0fe631d92f61f4708b03c16404c452