Partial cherry-pick changes on permission model change.

Meanwhile, aligned with handheld logic that revoking individually
controlled permission is marked as user fixed.

The original commit id I1d6cbc478c789e7680f41b92b9f3fa2504576ecd.

Test: Manual test on a local build.

Bug: 34440353
Change-Id: Ie3bb75225246eefef954926f94295181f4daebd0