Merge "Add a flag to enable SQLite storage for AppOps accesses" into main