[automerger skipped] Merge "[Settings] Access ProxySubscriptionManager within...

[automerger skipped] Merge "[Settings] Access ProxySubscriptionManager within DataUsage" am: 96533385 am: fc47bff6 -s ours am: 5b79ed5f -s ours am: 309cd837 -s ours am: e501cd2a -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: I9ad2450b0125555601c06994cdb8ea2f5ce8a7b2