[automerger skipped] Merge "Show/hide 5G preferred network type also consider allowed_network_type" am: 7e6c957fea
am: 8977c4ce49
-s ours am: 528b77a6e3
-s ours
am skip reason: Change-Id I493f2a2c7f4bc32b3fcb8ab2bace5839d8667bd5 with SHA-1 0393bbcc85
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394549
Change-Id: I468782ddc0c2afd6e353194c051fd5a6508c1b30
This commit is contained in: