[automerger skipped] DO NOT MERGE Disable privacy indicators am: 2628cf48 am: 75473c5d -s ours am: 9675f7a3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2bb8e291e4e3ed4c2147a3048e7867c4a30e50d7