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

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



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