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

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

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



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