Merge "Makes acknowledgeNewUserDisclaimer() a @TestApi"