Merge "Fix isAutoRevokeWhitelisted api to ignore manifest declaration" into rvc-qpr-dev