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

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

Change-Id: I19beea0b0ae98c5456377aefa2cdc49dd95313f3