Merge "Simplify the permission update conditions" am: 5e3ef685ef am: 6270a2577f

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

Change-Id: Ie2db47b298c7298c2d01d6ad78cb4a4ce3f0db33