Merge "Simplify the permission update conditions" am: 5e3ef685ef am: 192f0c63f1 am: a08199b183 am: 4724c6754b

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1903462

Change-Id: I1e5751154cb80fef8bcfc61549941d9f746225fc