[automerger skipped] Merge "Hide 'View plan' button in data usage settings" am: 07f2c27cbf
am: 94cabf8a02
am: d84135e91d
-s ours
am skip reason: Change-Id Ieda020bfa692e9465d6297e50cf338deff91a8a9 with SHA-1 f3d7860c70
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1480638
Change-Id: I6ad1a973c3289ce3284a49a01e57dc0629fbf99b
This commit is contained in: