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

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



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