Merge "DO NOT MERGE Disable privacy indicators" into rvc-qpr-dev am: 1639387a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I86d974a2e1274a218e74b2d5ac7576a85915b744