[automerger skipped] Merge "Merge "Rename resetNewUserDisclaimer() to...

[automerger skipped] Merge "Merge "Rename resetNewUserDisclaimer() to acknowledgeNewUserDisclaimer()" into sc-v2-dev am: d7a45338" into sc-v2-dev-plus-aosp am: 4007d054 -s ours

am skip reason: Merged-In I5670b1cb1206ad0a361bbd91b0a785a6b8075fdf with SHA-1 1e7e2ece is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16830692

Change-Id: I3df9a731ca6600f41ed4e0330038a8198e41e59b