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

[automerger skipped] Merge "Disable click on privacy chip before provision" into sc-qpr1-dev am: 40665a79 -s ours

am skip reason: Merged-In I9c8f642976f3332f4d5c9db89a4917dae501f251 with SHA-1 d5038c72 is already in history

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



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