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: 180e05fb am: 82d42f2f

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



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