[automerger skipped] Merge "DO NOT MERGE Disable privacy indicators" into...

[automerger skipped] Merge "DO NOT MERGE Disable privacy indicators" into rvc-qpr-dev am: 1639387a am: 5fb1be50 am: 861c57d9 -s ours

am skip reason: subject contains skip directive

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7a06ac05d53f4201a0386a784c3633db4ef6f49f