Merge "Merge "Rename resetNewUserDisclaimer() to acknowledgeNewUserDisclaimer()" into sc-v2-dev am: d7a45338" into sc-v2-dev-plus-aosp