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: 5c49c74e am: e373e918

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



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