Merge changes from topic "am-e0fac6ee9d214df680c6516582ea20a3" into tm-qpr-dev-plus-aosp

* changes:
  [automerger skipped] Merge "[DO NOT MERGE] Disallow clicks on privacy chip before provisioned" into sc-v2-dev am: 8579c6ee65 -s ours am: 427d692450 -s ours am: 44a8af5ac4 -s ours am: 356bf392cc -s ours
  [automerger skipped] [DO NOT MERGE] Disallow clicks on privacy chip before provisioned am: d5038c7253 -s ours am: f088cab69d -s ours am: 0ebab6a9df -s ours am: 7b88ff7675 -s ours