Merge "Don't back off for first few system stops." into udc-dev am: 0f26a22c am: 5dce320b

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



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