Role re-evaluation should respect ask every time choice by user Role evalation respect USER_SET flag when the role is not supposed to override user choices. Role granting logic is missing ONE_TIME check, ONE_TIME flag should be considered a user choice. Fix: 355411348 Test: RolePermissionOverrideTest FLAG: EXEMPT bug fix Relnote: security bug fix (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7e1f7097f4a6895358bf1472e6d26c5198d00c11) (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9c845caea2d4a9ba6be6be7b222976ecbcde2a89) Merged-In: Ie65c2cd62ba3f24e8dd411abca49e397746bc1a9 Change-Id: Ie65c2cd62ba3f24e8dd411abca49e397746bc1a9