Merge "Fix add and remove times for visual indicator" into udc-dev am:...

Merge "Fix add and remove times for visual indicator" into udc-dev am: ed2c1144 am: 73c5e080 am: 6fca05b5 am: 72d97601

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



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