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

Change-Id: I5155bc8da34231b6f7a91a4f27c21fa4473970c1