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

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



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