[automerger skipped] Merge "Update BackgroundDexOptServiceIntegrationTests" am: f3e5403f71 am: 28ce723a53 am: 54c11dc209 -s ours

am skip reason: Change-Id I3d4f96e27586cbf647d301a4ee7afd32576bbf41 with SHA-1 0a0623f32e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I428117b6aa3e3efd479be91e8d2b8160f2ee09f3