Merge "Update BackgroundDexOptServiceIntegrationTests" am: f3e5403f71 am: 28ce723a53

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5bebec11dca5ba47913b4e65a8b8dc43eba87c1a