Merge "Fixed mRestrictBackgroundWhitelistRevokedUids usage."