apparmor: lint fixes

Change-Id: I33181168efe1e3445dbc67f875a5c35d5b765219
Merge "apparmor: lint fixes" into production