Merge "Merge "Fix indicator not removing in certain cases" into tm-dev am: b2b75d9b am: 796c9aa1" into tm-d1-dev-plus-aosp am: 82237fba

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



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