Merge "Fix indicator not removing in certain cases" into tm-dev am: b2b75d9b am: 84f287bb

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



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