Merge "Fix VisibleForTesting annotation in AppStateAppOpsBridge"