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

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

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



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