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

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



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