[automerger skipped] Merge "New @TestApi:...

[automerger skipped] Merge "New @TestApi: DevicePolicyManager.isNewUserDisclaimerAcknowledged()" into sc-v2-dev am: 7ac3a069 am: 02272fd2 -s ours

am skip reason: Merged-In I8b98a1af60db65c1b27f19cf3e93b21d33d88278 with SHA-1 9a6b808d is already in history

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

Change-Id: I0636a0fc99c4a8edab63440fc7423346209ac6cd