Merge "Updating to go back to repeated" into udc-dev am: 0a8777bb am: fbbbc96f am: da22e2c3 am: e2caa8e1

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



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