[automerger skipped] Fix privacy indicators leak (i.e., active op leak) am: 4696c675 -s ours

am skip reason: Merged-In I48f5577f7c611eccdd803a2a9c32790362a329ea with SHA-1 5d7e9f78 is already in history

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



Change-Id: Iff7bdccbcbe102c2f63502e8b286f0e6afccbb9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>