[automerger skipped] DO NOT MERGE Disable privacy indicators am: 2628cf48...

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

am skip reason: subject contains skip directive

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

Change-Id: I27e5bfe98f74e57c3438f4d8c9bc1b17284ba2fe