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

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



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