[automerger skipped] Merge "[Settings] Access ProxySubscriptionManager within DataUsage" am: 96533385 am: fc47bff6 -s ours am: 5b79ed5f -s ours

am skip reason: Change-Id I2cb30dd0570a09543a13ca01cf054ba2d18d70d4 with SHA-1 dcd92af0 is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1391160

Change-Id: I5785c59cc57f97c35202c642716be82e9c375f47