[automerger skipped] Merge "Hide edit menu if network is uneditable" into...

[automerger skipped] Merge "Hide edit menu if network is uneditable" into rvc-qpr-dev am: 5cb66024 am: 0b34d62f -s ours

am skip reason: skip tag Change-Id I47ea2cf19e178eff48f23e56903d0daa4ef8fa28 with SHA-1 b7dbd3a9 is already in history

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

Change-Id: I84ab62558f79fbbd263026177ee3adcc6cb90dfc