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

Change-Id: Ib708eeec4162a1f3254ef021df495b51725f5fa6