[automerger skipped] Merge "Add explicit dep on services.backup" am: 20b012282e am: 6953bc127b -s ours am: 1dd4f123cf -s ours am: d361e4cd7b -s ours
am skip reason: Change-Id Ice2abeb3f4d031cfe15ce919b750d6de59316c1f with SHA-1 7e7fc7201e is in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1370357
Change-Id: I0ba5c4b47c420285f5d1a10536109a0517daddac
This commit is contained in: