am 8a23ad62: (-s ours) am 90b030ba: Merge "Do not show removed permissions in the UI - framework" into mnc-dev

* commit '8a23ad62c5fc9b2df63bf5266109a6c85254b591':