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

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



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