Merge "Updating to go back to repeated" into udc-dev am: 0a8777bb am:...

Merge "Updating to go back to repeated" into udc-dev am: 0a8777bb am: dc33d115 am: 275fb954 am: 80e089ad

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



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