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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2a30fde30df3230b3f4e7264480c8d6cd48595ff