[automerger skipped] Merge "Hide edit menu if network is uneditable" into rvc-qpr-dev am: 5cb66024fc am: 0b34d62f6b -s ours am: 81a7617077 -s ours
am skip reason: skip tag Change-Id I47ea2cf19e178eff48f23e56903d0daa4ef8fa28 with SHA-1 b7dbd3a911 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13945393
Change-Id: If1fff33d2a2cd96e0599e2a17957e2ec96994228
This commit is contained in: