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

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

Change-Id: If7eba1c102153b94c82d6d9910de47faa86be4d3