Merge "Add explicit dep on services.backup" am: 20b012282e

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

Change-Id: Ib26cddaf0cb9236dffa0937fb8b95a2cf3422aea