Merge "Merge "Allow to grant soft restricted permissions" into qt-dev am:...
Merge "Merge "Allow to grant soft restricted permissions" into qt-dev am: c9a18c08 am: 0ae858bb" into qt-r1-dev-plus-aosp
am: 925bd322
Change-Id: Icf1e10119e84c427e1f6df54f7b9f9771266d5a0