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

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



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