Merge "Move testAlwaysRequireConsent to frameworks/base" into sc-dev