[automerger skipped] Merge "Disable click on privacy chip before provision"...

[automerger skipped] Merge "Disable click on privacy chip before provision" into sc-dev am: 39357500 -s ours am: 1afdf373 -s ours

am skip reason: Merged-In I8099dfd259b149cd18509677d623de7a352f5de0 with SHA-1 bf4d73f6 is already in history

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



Change-Id: I6ff27e2d1318aac7a78609a1ec48614ccf6dba7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>