[automerger skipped] Merge "Add explicit dep on services.backup" am:...

[automerger skipped] Merge "Add explicit dep on services.backup" am: 20b01228 am: 6953bc12 -s ours am: 1dd4f123 -s ours

am skip reason: Change-Id Ice2abeb3f4d031cfe15ce919b750d6de59316c1f with SHA-1 7e7fc720 is in history

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

Change-Id: I3bd33f57952ef701d77bcabc56674adf1bbc6af8