Merge "Add cache to AppOpsController" into qt-r1-dev
am: 0e54bdf57a

Change-Id: Ieacd78c73f667d1cadb672f739812f106d38cfc6