Merge "Add an aconfig flag for AppOp mode caching" into main