[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 am: 7191d714 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5e42a3511786cc729a423439d70dacf065bae4c5