[automerger skipped] Merge "Fix privacy indicators leak (i.e., active op...

[automerger skipped] Merge "Fix privacy indicators leak (i.e., active op leak)" into udc-mainline-prod am: ff0a17cb -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: I7cbcab4775dcc720f0fcf74c455419f487c5e23e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>