Merge "Fix auto revoke installer whitelist APIs" into rvc-dev am: 511c3aa955

Change-Id: I3a97457a60f9dfcc42e1dea65162c575b0c8b816