[automerger skipped] Merge "DO NOT MERGE Implement privacy chip design" into...

[automerger skipped] Merge "DO NOT MERGE Implement privacy chip design" into sc-dev am: 4b8044cb -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I85c87127f53ff4650bf09a7c28dd639c488f4530