[automerger skipped] Merge "Mainline remove hide api SubscriptionInfo.getCardString" am: d3c8a4c3ee
am: d03c8bfb1c
-s ours am: 4cd2283768
-s ours am: 5c1fbcc7d1
-s ours
am skip reason: Change-Id Idb44af6a01626013339f5ca05486dd11112a5867 with SHA-1 5189dc3860
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1387128
Change-Id: Ie6f2aeb9d71bd96f00b5c592a4a483e69e2041aa
This commit is contained in: