Merge "Fix ResumeOnRebootServiceProviderTests" am: db8ed62e01 am: aae8912a37 am: 1c5e5fe444

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id02a0b6f083dd7b448aa6c08f614630fe10bcd7f